Resolve the issue of failing to retrieve attachments in dubbo 2.7.6 and 2.7.7 #12982
Conversation
steverao
changed the title
| public Iterable<String> keys(DubboRequest request) { | ||
| return request.invocation().getAttachments().keySet(); | ||
| RpcInvocation invocation = request.invocation(); |
There was a problem hiding this comment.
Hi @laurit, is it necessary to add unit test here? I don't seem to have found any related test in current codebase, do you have any suggestion?
There was a problem hiding this comment.
I guess here it is a wider issue, this method is only used by jaeger and open tracing baggage propagation. We don't really test this method at all in any of the TextMapGetter implementations.
Since creating the unit test isn't probably particularly hard it would be best to add it. You could start with
package io.opentelemetry.instrumentation.apachedubbo.v2_7;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;
import java.net.InetSocketAddress;
import java.util.Iterator;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcInvocation;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
class DubboHeadersGetterTest {
@Mock RpcContext context;
@Test
void keys() {
when(context.getUrl()).thenReturn(new URL("http", "localhost", 1));
when(context.getRemoteAddress()).thenReturn(new InetSocketAddress(1));
when(context.getLocalAddress()).thenReturn(new InetSocketAddress(1));
RpcInvocation invocation = new RpcInvocation();
invocation.setAttachment("key", "value");
DubboRequest request = DubboRequest.create(invocation, context);
Iterator<String> iterator = DubboHeadersGetter.INSTANCE.keys(request).iterator();
assertThat(iterator.hasNext()).isTrue();
assertThat(iterator.next()).isEqualTo("key");
assertThat(iterator.hasNext()).isFalse();
}
}You could change the DubboHeadersGetter. keys implementation to always call getObjectAttachments when it is present. Then your test could use a mock for RpcInvocation and test could verify that the expected method was called based on the latest dep flag. That way you wouldn't need to bother with testing the 2.7.6 and 2.7.7 versions that have the issue.
Resolves #12978